Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed typo / logical merge conflict #433

Merged
merged 1 commit into from
May 27, 2021
Merged

Fixed typo / logical merge conflict #433

merged 1 commit into from
May 27, 2021

Conversation

jorgecarleitao
Copy link
Member

@jorgecarleitao jorgecarleitao commented May 27, 2021 •
edited
Loading

master broke when I merged #339 due to some API conflict beyond what git can detect. This fixes it.

@jorgecarleitao jorgecarleitao changed the title Fixed master. Fixed typo. May 27, 2021
@Dandandan Dandandan merged commit 9c0ad7b into apache:master May 27, 2021
@alamb
Copy link
Contributor

alamb commented May 27, 2021

Thanks @jorgecarleitao and @Dandandan

@alamb alamb changed the title Fixed typo. Fixed typo / logical merge conflict May 27, 2021
@houqp houqp added the datafusion Changes in the datafusion crate label Jul 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Dandandan Dandandan Dandandan approved these changes

@alamb alamb Awaiting requested review from alamb

Assignees
No one assigned
Labels
datafusion Changes in the datafusion crate
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jorgecarleitao @alamb @Dandandan @houqp